Upd test

diff --git a/src/siri/net/bserver.c b/src/siri/net/bserver.c
index 73378864897f02436b19e19730bebbe5e69906c3..46a80022ce50bbcc15dcbcd1dec3342272b6e941 100644 (file)
--- a/src/siri/net/bserver.c
+++ b/src/siri/net/bserver.c
@@ -132,7 +132,7 @@ int sirinet_bserver_init(siri_t * siri)
                     UV_TCP_IPV6ONLY : 0);
 
     rc = uv_listen(
-            (uv_stream_t*) &backend_server,
+            (uv_stream_t *) &backend_server,
             DEFAULT_BACKLOG,
             on_new_connection);
 

diff --git a/src/siri/net/pipe.c b/src/siri/net/pipe.c
index 14748e7e8472f7ba4d8675779b81dd8546a3f8ad..5f5fc3461c028c565a8f8fdc38c665e921ac0607 100644 (file)
--- a/src/siri/net/pipe.c
+++ b/src/siri/net/pipe.c
@@ -25,9 +25,11 @@ char * sirinet_pipe_name(uv_pipe_t * client)
 
     buffer[len] = '\0';
     return buffer;
-
 }
 
+/*
+ * Cleanup socket (pipe) file.
+ */
 void sirinet_pipe_unlink(uv_pipe_t * client)
 {
     char * pipe_name = sirinet_pipe_name(client);

diff --git a/src/siri/net/stream.c b/src/siri/net/stream.c
index 71e925d195438445e6373a1214f0a2f841f28fd6..18235ed4401a20ad36ddaf3de706d64415e2353f 100644 (file)
--- a/src/siri/net/stream.c
+++ b/src/siri/net/stream.c
@@ -32,7 +32,6 @@
     sirinet_stream_decref(client);      \
     return;
 
-
 /*
  * Returns NULL and raises a SIGNAL in case an error has occurred.
  *
@@ -40,6 +39,7 @@
  */
 sirinet_stream_t * sirinet_stream_new(sirinet_stream_tp_t tp, on_data_cb_t cb)
 {
+    size_t stream_sz;
     sirinet_stream_t * client = malloc(sizeof(sirinet_stream_t));
 
     if (client == NULL)
@@ -57,9 +57,21 @@ sirinet_stream_t * sirinet_stream_new(sirinet_stream_tp_t tp, on_data_cb_t cb)
     client->siridb = NULL;
     client->ref = 1;
 
-    size_t stream_sz = (tp == STREAM_PIPE_CLIENT)
-            ? sizeof(uv_pipe_t)
-            : sizeof(uv_tcp_t);
+    switch(tp)
+    {
+    case STREAM_TCP_CLIENT:
+    case STREAM_TCP_BACKEND:
+    case STREAM_TCP_SERVER:
+    case STREAM_TCP_MANAGE:
+        stream_sz = sizeof(uv_tcp_t);
+        break;
+    case STREAM_PIPE_CLIENT:
+        stream_sz = sizeof(uv_pipe_t);
+        break;
+    default:
+        stream_sz = sizeof(uv_stream_t);
+        assert(0);
+    }
 
     client->stream = malloc(stream_sz);
     if (client->stream == NULL)
@@ -94,7 +106,6 @@ char * sirinet_stream_name(sirinet_stream_t * client)
     return NULL;
 }
 
-
 /*
  * This function can raise a SIGNAL.
  */
@@ -223,8 +234,6 @@ void sirinet_stream_on_data(
     }
 }
 
-
-
 /*
  * Never use this function but call sirinet_stream_decref.
  * Destroy stream. (parsing NULL is not allowed)

diff --git a/test/run_all.py b/test/run_all.py
index 211d7cd7bd8f44d02953d2d762451bf8472dc275..5778f982816d0933a6a3343ad76b614c69c36069 100644 (file)
--- a/test/run_all.py
+++ b/test/run_all.py
@@ -12,6 +12,8 @@ from test_server import TestServer
 from test_user import TestUser
 from test_compression import TestCompression
 from test_log import TestLog
+from test_log import TestLog
+from test_pipe_support import TestPipeSupport
 
 
 Server.BUILDTYPE = 'Release'
@@ -28,3 +30,4 @@ if __name__ == '__main__':
     run_test(TestServer())
     run_test(TestUser())
     run_test(TestLog())
+    run_test(TestPipeSupport())

diff --git a/test/test_pipe_support.py b/test/test_pipe_support.py
index 0e6169901d1228635ce725733fb1d93207b27f71..c556be4141c439d768a42cbc5e5d46b97077750d 100644 (file)
--- a/test/test_pipe_support.py
+++ b/test/test_pipe_support.py
@@ -52,7 +52,17 @@ class TestPipeSupport(TestBase):
 
         await pipe_client.connect('iris', 'siri', self.db.dbname)
 
-        await pipe_client.insert(DATA)
+        self.assertEqual(
+            await pipe_client.insert(DATA),
+            {'success_msg': 'Successfully inserted 10 point(s).'})
+
+        self.assertAlmostEqual(
+            await pipe_client.query('select * from "series num_float"'),
+            {'series num_float': DATA['series num_float']})
+
+        self.assertEqual(
+            await pipe_client.query('select * from "series num_integer"'),
+            {'series num_integer': DATA['series num_integer']})
 
         self.assertEqual(
             await pipe_client.query('select * from "series_log"'),
@@ -60,7 +70,6 @@ class TestPipeSupport(TestBase):
 
         pipe_client.close()
 
-
         # return False